From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Thu, 19 Oct 2006 16:01:51 +0000 (+0100)
Subject: [SOLARIS] Don't use -nostdinc as it prevents getting stadrg.h
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15589^2~23
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=943ca75a60dc1232917c9c80e06ab81411acceb6;p=xen.git

[SOLARIS] Don't use -nostdinc as it prevents getting stadrg.h
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index fd1a52e365..fc4241fafb 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -11,7 +11,12 @@ HAS_VGA  := y
 pae ?= n
 supervisor_mode_kernel ?= n
 
-CFLAGS += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
+# Solaris grabs stdarg.h and friends from the system include directory.
+ifneq ($(XEN_OS),SunOS)
+CFLAGS += -nostdinc
+endif
+
+CFLAGS += -fno-builtin -fno-common -fno-strict-aliasing
 CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS += -I$(BASEDIR)/include 
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
diff --git a/xen/include/xen/stdarg.h b/xen/include/xen/stdarg.h
index a9bdaca256..9508bc4df4 100644
--- a/xen/include/xen/stdarg.h
+++ b/xen/include/xen/stdarg.h
@@ -1,4 +1,4 @@
-#if defined(__OpenBSD__) || defined(__sun__)
+#if defined(__OpenBSD__)
 #  include "/usr/include/stdarg.h"
 #else
 #  include <stdarg.h>